From b89ab05440c2b7cc40f36b4a29f9404f76175631 Mon Sep 17 00:00:00 2001
From: "awilliam@xenbuild.aw" <awilliam@xenbuild.aw>
Date: Thu, 30 Mar 2006 12:47:45 -0700
Subject: [PATCH] [IA64] cleanup

Minor cleanups from the previous patch

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---
 xen/arch/ia64/linux-xen/smp.c | 7 +++++--
 xen/include/asm-ia64/vhpt.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xen/arch/ia64/linux-xen/smp.c b/xen/arch/ia64/linux-xen/smp.c
index 953b930644..7004ad4c9e 100644
--- a/xen/arch/ia64/linux-xen/smp.c
+++ b/xen/arch/ia64/linux-xen/smp.c
@@ -47,8 +47,8 @@
 #include <asm/tlbflush.h>
 #include <asm/unistd.h>
 #include <asm/mca.h>
-#include <asm/vhpt.h>
 #ifdef XEN
+#include <asm/vhpt.h>
 #include <asm/hw_irq.h>
 #endif
 
@@ -291,11 +291,14 @@ smp_flush_tlb_all (void)
 {
 	on_each_cpu((void (*)(void *))local_flush_tlb_all, NULL, 1, 1);
 }
+
+#ifdef XEN
 void
 smp_vhpt_flush_all(void)
 {
-    on_each_cpu((void (*)(void *))vhpt_flush, NULL, 1, 1);
+	on_each_cpu((void (*)(void *))vhpt_flush, NULL, 1, 1);
 }
+#endif
 
 #ifndef XEN
 void
diff --git a/xen/include/asm-ia64/vhpt.h b/xen/include/asm-ia64/vhpt.h
index d0a31c49fa..85216541d4 100644
--- a/xen/include/asm-ia64/vhpt.h
+++ b/xen/include/asm-ia64/vhpt.h
@@ -20,7 +20,7 @@
 #ifdef CONFIG_SMP
 # define vhpt_flush_all()	smp_vhpt_flush_all()
 #else
-# define vhpt_flush_all()   vhpt_flush()
+# define vhpt_flush_all()	vhpt_flush()
 #endif
 // FIXME: These should be automatically generated
 
-- 
2.30.2